print: Make things compile again
authorBenjamin Otte <otte@redhat.com>
Mon, 18 Oct 2010 17:01:55 +0000 (19:01 +0200)
committerBenjamin Otte <otte@redhat.com>
Mon, 18 Oct 2010 17:22:44 +0000 (19:22 +0200)
Remove workaround for entries - the general codepath should just work.

gtk/gtkprinteroptionwidget.c

index 8349d2c8bb3e7e7d8e95b177d9922061de66abde..28cc5bfba8a6e74f9a966ea4b6c4b586ac496788 100644 (file)
@@ -372,18 +372,11 @@ combo_box_get (GtkWidget *combo)
   gchar *value;
   GtkTreeIter iter;
 
-  if (gtk_combo_box_get_has_entry (GTK_COMBO_BOX (combo)))
-    {
-      value = gtk_combo_box_get_active_text(GTK_COMBO_BOX (combo));
-    }
-  else
-    {
-      model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
+  model = gtk_combo_box_get_model (GTK_COMBO_BOX (combo));
 
-      value = NULL;
-      if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
-         gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
-     }
+  value = NULL;
+  if (gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter))
+     gtk_tree_model_get (model, &iter, VALUE_COLUMN, &value, -1);
 
   return value;
 }